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 am: 881963c8

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



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