Merge "More actionable reenablement dialogs for quick affordances." into udc-dev am: 00ce757d am: 24319a12

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



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