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

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

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