Merge "Merge "Reduce PiP flickering when switch apps with orientation change"...

Merge "Merge "Reduce PiP flickering when switch apps with orientation change" into udc-dev am: 4b4b8d7b am: eb3d22a1 am: 91e9707f" into udc-qpr-dev-plus-aosp am: 6b6cd3a6

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



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