[automerger skipped] Merge "Merge "Select the default clock if current clock id was not found" into udc-dev am: 355442341c am: 73d9d2084f" into udc-d1-dev-plus-aosp am: 550d490679 -s ours am: a42b732f17 -s ours

am skip reason: Merged-In Iff766fdb9ef5c914eda5454686d8181562748dec with SHA-1 e71e4fc163 is already in history

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

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