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

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

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