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

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

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