[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-qpr-dev am: 339a0d7c am: a697e288 am: 6b3e2464 -s ours

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

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



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