Merge "Fix the blank PiP window when unlock" into tm-dev am: 6e086786 am:...

Merge "Fix the blank PiP window when unlock" into tm-dev am: 6e086786 am: c29f9a56 am: 3dfec343 am: 4cbdf7ae

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



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