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: I39ad74c73e5d20f8a1b0b00d0bb3045fe7e6df8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>