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

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

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