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

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



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