Merge "Reduce flickering when exiting PiP to fullscreen" into udc-dev am: a5de62db

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



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