Merge "[tp] More actionable reenablement dialogs for quick affordances." into...

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

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



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