Merge "Fix failing testOnPictureInPictureRequested" into rvc-dev am: bcb2d73e am: 6f77d48b am: 309d7c2c am: 4faf9b25 Change-Id: I696bc656c5cef0b979af9763adba6c8fe843ca5a