Merge "Fix graphical glitches on keyguard-unlock with PIP" into udc-dev am:...

Merge "Fix graphical glitches on keyguard-unlock with PIP" into udc-dev am: c8196383 am: 98821cf0 am: 685aadb4

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



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