Merge "Merge "Improved re-enablement dialog text." into udc-dev am: e8856feb...

Merge "Merge "Improved re-enablement dialog text." into udc-dev am: e8856feb am: 9f4181f6 am: c3b5665d" into udc-qpr-dev-plus-aosp am: aa91c2ca

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



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