Merge "Fix the blank PiP window when unlock" into tm-dev am: 6e08678675 am: c29f9a563f am: 3dfec343b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18203211 Change-Id: I2e32c7289c0e331c8c0f22c5129fa87cdf65aeb1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: