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 am: 76b0e057

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



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