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

Merge "[automerger skipped] Merge "Handle waking from unlock in KeyguardViewMediator." into udc-dev am: 83270333 am: 7db635ba -s ours am: 3e467247 -s ours" into udc-qpr-dev-plus-aosp am: b8131bb4 -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: I41c3adfa76d03298b8b925a744e9c36732815ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>