Merge "Revert "Fixes touch targets for several tabs in ThemePicker"" into...

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

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



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