Merge "[CDM] Make CDM transport APIs available to the system services" into main