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: e9a4c567 am: ba485e6c am: fcc2d0ee

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



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