Merge "Don't dismiss the keyguard from the binder thread" into tm-qpr-dev am: 2aea66b3

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



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