[automerger skipped] Merge "isUserInLockDown can be true when there are other...

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

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

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



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