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: 05c9a25e

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



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