Merge "Fix dismiss callback when keyguard is dismissing." into udc-dev am:...

Merge "Fix dismiss callback when keyguard is dismissing." into udc-dev am: e8859325 am: ff4a0d70

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



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