[automerger skipped] Merge "RESTRICT AUTOMERGE Unset StrongAuthFlags when...

[automerger skipped] Merge "RESTRICT AUTOMERGE Unset StrongAuthFlags when unlocking a user profile" into tm-dev am: 5233950a am: 4090ce85 -s ours

am skip reason: Merged-In Ic466fc22a5be9047d39194ad42c56dc4a2acb4dc with SHA-1 49886792 is already in history

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



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