[automerger skipped] Merge "Show custom message when user has specifically...

[automerger skipped] Merge "Show custom message when user has specifically locked down the device." into udc-dev am: b10af913 am: bfdc6fd1 -s ours

am skip reason: Merged-In I6706150f23501ca17bca445f1ea1dccf7794e31e with SHA-1 4a66effc is already in history

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



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