[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: 7fe090e6 -s ours am: 75a5bd2d -s ours am: 5ddd699e -s ours am: 04585759 -s ours am: 9bf0a733 -s ours

am skip reason: subject contains skip directive

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



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