[automerger skipped] Merge "Fix entering PiP transition in button navigation mode" into sc-dev am: 73ef335c0f -s ours am: c9fba2770e -s ours
am skip reason: Merged-In Ie54a54de6e55397e25024373ea4e2855fde2d9f7 with SHA-1 1ce14dda7e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15329896
Change-Id: Ie79c0ede4d29f74f813edd18fc5abf92401dd767
This commit is contained in: