[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: 0de10414 am: edd48b50 am: 8255c9a4 -s ours am: 6e5332ed -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: Iba5e906825e1f2a5297c3009d85dc0a9a5dcf27f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>