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

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

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