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

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

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



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