Merge "Fix work profile security challenge screen isn't properly shown" into...

Merge "Fix work profile security challenge screen isn't properly shown" into udc-dev am: 9fda153a am: 47912d27 am: 4b68d431 am: cf7116ed

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



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