Merge "[TP] Change custom clocks flag name" into tm-qpr-dev am: 802e8ed174

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

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