[automerger skipped] Merge "isUserInLockDown can be true when there are other strong auth requirements" into tm-qpr-dev am: 339a0d7cab am: a697e288ca am: 881963c82d am: f90481e83b -s ours

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

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

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