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

Merge "Merge "Fix graphical glitches on keyguard-unlock with PIP" into udc-dev am: c8196383 am: ee1ba6c1" into udc-d1-dev-plus-aosp am: 3dddb0fe

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



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