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