Fix icon and tile padding for color theme picker am: 0601635bcf

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

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