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

[automerger skipped] Merge "Fix entering PiP transition in button navigation mode" into sc-dev am: 73ef335c am: 6a125634 -s ours

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

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

Change-Id: Ifedfa468e2334176a5dcc1c4a138751cbc5377d5