[automerger skipped] Merge "Merge "Fix letterbox issue when auto-enter-pip...

[automerger skipped] Merge "Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev am: 5a590720" into sc-mainline-prod am: 3579487d -s ours

am skip reason: Merged-In Ie657d15d9edb9d07555bd166b5919bb12cb217e6 with SHA-1 ebe8550d is already in history

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

Change-Id: I2d1a3b4bfbffd6880fe3db24e48d96432f95804e