Merge "Color Picker Fragment UX Polish" into tm-qpr-dev am: 5b247ee9 am: f6884304

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



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