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

Change-Id: If6a24ce29d891159a60e4690eb82ef83b2f82885