Merge "RESTRICT AUTOMERGE Unset StrongAuthFlags when unlocking a user profile" into tm-dev am: 5233950a

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



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