Merge "Revert and fix "Fix for color picker pager getting clipped"" into tm-qpr-dev am: dc63063135 am: fb0bc5813c am: b3aad5453e am: dddb1377bc

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

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