Merge "More actionable reenablement dialogs for quick affordances." into...

Merge "More actionable reenablement dialogs for quick affordances." into udc-dev am: 00ce757d am: 48c068b4 am: 8cf3c080 am: 2d9193bc

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



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