Merge "Headless: fix locking work profile with separate challenge on power...

Merge "Headless: fix locking work profile with separate challenge on power button" into udc-dev am: 96e51591 am: b8f2b0ad

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



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