Merge "[TP] Clock color picker" into tm-qpr-dev am: c98daa6009

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

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