Merge "Improved re-enablement dialog text." into udc-dev am: e8856feb am: 9774be49 am: 745e361c

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



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