Quick affordance picker in ThemePicker. am: 573aae856c am: 38cc4b2e83

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

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