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

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



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