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

Change-Id: I559cac2d1dce506ddee063dd1842b8ce6b3ff834