[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: b8439426 -s ours

am skip reason: subject contains skip directive

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



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