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

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

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