Merge "KeyguardManager: clarify behavior for profile with separate challenge" into main am: aea7009e41

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

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