Merge "Show custom message when user has specifically locked down the device."...

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

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



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