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: eb88f40e

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



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