Merge "Select the default clock if current clock id was not found" into...

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

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



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