Merge "Fixes touch targets for several tabs in ThemePicker" into udc-dev am: 114ed27f

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



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