Merge "Handle waking from unlock in KeyguardViewMediator." into udc-dev am: 83270333ff am: 8d4af1031c

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

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