Merge "Write descriptors for Mtp in UsbService" into pi-dev
am: df101a4596

Change-Id: If12b1138a9be2f2e653c070c44d54ebfe008b7ff