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: 426b509b

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



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