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: I9a4b94f727d034c9e602c37989eb8136a03f07bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>