[automerger skipped] Merge "Merge "Select the default clock if current clock...

[automerger skipped] Merge "Merge "Select the default clock if current clock id was not found" into udc-dev am: 35544234 am: 73d9d208" into udc-d1-dev-plus-aosp am: 550d4906 -s ours

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

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



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