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

[automerger skipped] Merge "Handle waking from unlock in KeyguardViewMediator." into udc-dev am: 83270333 am: 7db635ba am: 373d1710 -s ours

am skip reason: Merged-In Ia6fa9681be950adc1b9aae6f7abcd4d7f19db156 with SHA-1 772d0ed0 is already in history

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



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