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

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

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