Merge "UI polish for affordance reenablement dialog." into tm-qpr-dev am: 15dab578fa am: 1c0ab610ed

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

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