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

Change-Id: I4bea52a42951382d84bf7f040e887ca8e1c025be