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

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



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