Merge "Fix other reproduction of invisible keyguard race" into tm-qpr-dev am:...

Merge "Fix other reproduction of invisible keyguard race" into tm-qpr-dev am: 2b9ee44d am: db00e56e am: 25acb563 am: d83630e7

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



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