[automerger skipped] Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev am: 5a590720 am: 9b5b669c -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: If6b89abf0fc423fd4aa212a373dbcea07ff8d033