Merge "Revert and fix "Fix for color picker pager getting clipped"" into tm-qpr-dev am: dc630631

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



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