Merge "[CDM] Use proper package name when calling attach/detachSystemDataTransport APIs." into main