[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: 0de10414 am: edd48b50" into udc-d1-dev-plus-aosp am: 4a80d349 -s ours am: 627f35db -s ours

am skip reason: Merged-In I98d96bf72cbe09895b644a5a53f86499bf74bfab with SHA-1 6194a276 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24499883



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