Merge "VideoView2: Move MediaControlView2's hidden constants" into pi-dev
am: 7c1236a034

Change-Id: I27afc59cc2129702bb9ea6fc1c89d41897291ef0