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

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



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