Merge "UX polish for quick affordance option border." into tm-qpr-dev am: e6c8d19b8e

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

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