tree d0836ab16c66aacb4416e504458b3e57dfa00f0e
parent 39515d49cbecfcc0da65a8a9c9202a9ad839e0b6
parent c8b6efab58dbc1481fd0f36b103791b430b8458b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1706301556 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706301556 +0000

[automerger skipped] Merge "isUserInLockDown can be true when there are other strong auth requirements" into rvc-dev am: 19075fd670 am: 976d59d1f9 am: 3201f76202 am: 8831b577c6 am: c8b6efab58 -s ours

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

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

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