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

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

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