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

Merge "Merge "Merge "Dismiss the keyguard through #notifyKeyguardAuthentiated" into udc-dev am: eb6d0c35" into udc-d1-dev am: 41ddca38 am: 6704496b" into udc-qpr-dev-plus-aosp am: efded80d

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



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