Merge "Quick affordance picker in ThemePicker." into tm-qpr-dev am: ad413fcfdd am: 5d56aaf485

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

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