[automerger skipped] Merge "DO NOT MERGE Dismiss keyguard when simpin auth'd and..." into rvc-dev am: 2b3817680a am: cd993dd7e0 -s ours am: 4d4d843d5a -s ours am: df080e09b4 -s ours am: c3068ba5b6 -s ours am: ead918b2f2 -s ours

am skip reason: subject contains skip directive

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

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