Merge "Merge "Select the default clock if current clock id was not found" into udc-dev am: 355442341c am: 73d9d2084f" into udc-d1-dev-plus-aosp