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

[automerger skipped] Merge "RESTRICT AUTOMERGE Unset StrongAuthFlags when unlocking a user profile" into tm-qpr-dev am: a90d019c -s ours am: 2bac0087 -s ours am: 01d1173c -s ours

am skip reason: subject contains skip directive

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



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