Merge "Select the default clock if current clock id was not found" into...

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

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



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