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: 7f503ed8 am: 7c0ba90d am: ac2daaee

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



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