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

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



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