Merge "Force theme icons to stay on one row and adjust size to fit" into tm-qpr-dev am: 9289dac9

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



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