Merge "Show custom message when user has specifically locked down the device." into udc-dev am: b10af9130a am: 5e8062916c

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

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