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

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

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