[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: eee89b5a9f -s ours am: 627c16f24c -s ours am: 89c37a5dd4 -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: If9394eb4ad1e893d900b8e0a9a5b3526c3c57e37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>