[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: c4579e00 -s ours am: 1875efb1 -s ours am: d4dfb494 -s ours am: be7a8372 -s ours am: cc2ca9ff -s ours

am skip reason: subject contains skip directive

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



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