Merge "Merge "Restores PiP to its original app bounds" into rvc-dev am:...
Merge "Merge "Restores PiP to its original app bounds" into rvc-dev am: 61117519 am: a05d4de5" into rvc-d1-dev-plus-aosp am: d73503f4
Change-Id: Id712a5fd98fdf3cadfee3b6f9f8de30eb013bce8