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

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



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