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

[automerger skipped] Merge "Select the default clock if current clock id was not found" into udc-dev am: 35544234 am: 3ab16f52 -s ours am: 9102b489 -s ours

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

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



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