Merge "Make sure keyguard unlock resets pip corners" into udc-qpr-dev am: 8d9d2cc2

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



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