[automerger skipped] Merge "DO NOT MERGE Dismiss keyguard when simpin auth'd...

[automerger skipped] Merge "DO NOT MERGE Dismiss keyguard when simpin auth'd and..." into rvc-dev am: 2b381768 am: cd993dd7 -s ours am: 4d4d843d -s ours am: df080e09 -s ours am: c3068ba5 -s ours

am skip reason: subject contains skip directive

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



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