Merge "Detach CDM transport upon encountering an secure channel error" into udc-dev