Merge "Adjust color options to be larger for larger display sizes" into udc-qpr-dev am: 9a114d9a

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



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