Merge "Fixes touch targets for several tabs in ThemePicker by wrapping views...

Merge "Fixes touch targets for several tabs in ThemePicker by wrapping views in layout" into udc-dev am: 605fae1c

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



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