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: fdb367b7

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



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