Merge "Reduce flickering when swiping auto-pip with orientation change" into...

Merge "Reduce flickering when swiping auto-pip with orientation change" into udc-dev am: beda91f6 am: f4c5678f

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



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