Merge "isUserInLockDown can be true when there are other strong auth...

Merge "isUserInLockDown can be true when there are other strong auth requirements" into tm-qpr-dev am: 339a0d7c am: a697e288

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



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