Merge "CDD: Clarify the charging specs to refer when a USB type C port." into nougat-mr1-dev