Merge "[TP] Clock Settings" into tm-qpr-dev am: 906d65e2dd am: 1ff19de353

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

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