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

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



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