Merge "isUserInLockDown can be true when there are other strong auth requirements" into rvc-dev am: 19075fd670 am: 976d59d1f9 am: 3201f76202 am: 8831b577c6

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

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