Merge "Fix dismiss callback when keyguard is dismissing." into tm-qpr-dev am: 704b4a2c

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



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