Merge "Fix small gap between color option quadrants" into udc-dev am: 2c554e7189 am: 3e2b9e44c9

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

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