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

Change-Id: I6817bffd0466c6b9d90b6e5dae7f360a2a629853