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