[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: 5e806291 am: bdf74e88 -s ours am: 1369d0ac -s ours

am skip reason: Merged-In I6706150f23501ca17bca445f1ea1dccf7794e31e with SHA-1 240873cf is already in history

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



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