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

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



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