Merge "Make Clock options resettable (1/3)" into udc-dev am: 5fa9b6a6 am: 2d780174

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



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