tree af433eb4dd82ed7efc028f75a420332f7e1cd683
parent 6d06e8307e195440ee646ef0228dbd5bca51365c
parent 7fe090e659eeea8cf08b6d9e5f691b1506586f08
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1692990449 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1692990449 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE Unset StrongAuthFlags when unlocking a user profile" into tm-dev am: 5233950a66 am: 7fe090e659 -s ours

am skip reason: subject contains skip directive

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

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