Merge "Make MtpService fill in MTP DeviceInfo fields"
am: 792f244db4

Change-Id: I6d702191ff71684404f0d663fbb8c31773b01b61