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

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



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