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