Merge "Merge "Dismiss the keyguard through #notifyKeyguardAuthentiated" into...

Merge "Merge "Dismiss the keyguard through #notifyKeyguardAuthentiated" into udc-dev am: eb6d0c35 am: 888c6399 am: c352f6e8" into udc-qpr-dev-plus-aosp am: 4cdf1764

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



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