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

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



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