Merge "Select the default clock if current clock id was not found" into udc-qpr-dev am: 6bcdc99328 am: 80d6c875bb

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

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