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

Change-Id: I2a3b7dc00568c21850a99da71100b4522d8de2ac