[automerger skipped] Merge "Merge "Handle waking from unlock in...

[automerger skipped] Merge "Merge "Handle waking from unlock in KeyguardViewMediator." into udc-dev am: 83270333 am: 8d4af103" into udc-d1-dev-plus-aosp am: 7a9f2e17 -s ours am: ff6a4744 -s ours

am skip reason: Merged-In Ia6fa9681be950adc1b9aae6f7abcd4d7f19db156 with SHA-1 3aa54b2e is already in history

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



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