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

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

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

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

Change-Id: I5728dc8dc4499f93b1c6b854b8da05b236ef2a25