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

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



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