Merge "Select the default clock if current clock id was not found" into udc-dev am: 35544234

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



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