Merge "Merge "Add PipControlsView constructors" into rvc-dev am: 0f829652" into rvc-dev-plus-aosp am: e4791b10 Change-Id: Ieecd52d4b4827a8fe909c6ba68ae4283021290bf