Merge "Fix for color picker pager getting clipped" into tm-qpr-dev am: 0e41e555 am: 16351cfb

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



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