Merge "Revert "Fixes touch targets for several tabs in ThemePicker"" into udc-dev am: 30ecac46

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



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