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-dev am: 39515d49

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



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