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

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

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