[automerger skipped] Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev am: 5a590720 am: 3057504b -s ours am: d28ba250 -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: I34f20ce4142c8dcece5a072b4839175e83e9294c