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

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

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



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