[automerger skipped] Merge "Move PiP window upon tabletop mode changes" into...

[automerger skipped] Merge "Move PiP window upon tabletop mode changes" into tm-qpr-dev am: f542109b am: 2238420f -s ours

am skip reason: Merged-In Ie7ae440847c81d0a49ccd56061673d86977b3b64 with SHA-1 ea682836 is already in history

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



Change-Id: I0d386e330e902fdd371a508a4fccc26539be5dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>