Merge "[automerger skipped] Merge "Fix entering PiP transition in button...

Merge "[automerger skipped] Merge "Fix entering PiP transition in button navigation mode" into sc-dev am: 73ef335c am: fcdb6289 -s ours" into sc-v2-dev-plus-aosp am: e8559a35 -s ours

am skip reason: Merged-In Ie54a54de6e55397e25024373ea4e2855fde2d9f7 with SHA-1 33c3fcc6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329896

Change-Id: Ic613086c560d4aa3569b19f6ec639ceab47ea030