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-qpr-dev am: 591ac686

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



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