Merge "[tp] More actionable reenablement dialogs for quick affordances." into udc-dev am: 41ff36da3d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/23566552

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