[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 rvc-dev am: 19075fd6 am: 976d59d1 am: 3201f762 am: 8831b577 am: c8b6efab -s ours am: eee89b5a -s ours

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

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



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