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

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

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



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