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-qpr-dev am: 45a8dc0e am: aa2875c7

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



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