tree 8e007df549b35f9463e2401ba3b336195251c45a
parent bcf58f7cd3738a3c64672eff0d126b5430b2642e
parent bcac2c4240650b99990fb5b4815fc80b7365f58b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1706223097 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706223097 +0000

[automerger skipped] Merge "isUserInLockDown can be true when there are other strong auth requirements" into tm-dev am: 39515d49cb am: bcac2c4240 -s ours

am skip reason: Merged-In I5e979a7822dd7254b4579ab28ecf96df1db44179 with SHA-1 93149616ba is already in history

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

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