Merge "Select the default clock if current clock id was not found" into udc-qpr-dev am: 45a8dc0e

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



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