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

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

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