Merge "Select the default clock if current clock id was not found" into udc-dev am: 0de10414b2

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

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