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: I5addd6a8d2580e7f85e22bdcdcd4a1de5912d499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>