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

Merge "isUserInLockDown can be true when there are other strong auth requirements" into rvc-dev am: 19075fd6 am: 976d59d1

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



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