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: Ie8025813cc795a59d4f8b36c56cfdf009daa2bda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>