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

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



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