Merge "Fixes touch targets for several tabs in ThemePicker" into udc-dev am: 114ed27fd8 am: 87477e41a6

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

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