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

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



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