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

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



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