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: I0ed531b092e1928bbf2396f828b9552455376f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>