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: 0b202de4 am: 6b36f8cb

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



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