Merge "[automerger skipped] Merge "Fix dismiss callback when keyguard is dismissing." into tm-qpr-dev am: 704b4a2c am: 2c67f7ed -s ours" into udc-dev am: 4f0861fb -s ours am: 8fd223ea -s ours

am skip reason: Merged-In Ia51ec982dd78b69db82f69ae525e402bd461f294 with SHA-1 04f57197 is already in history

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



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