Merge "Make users of MtpServer provide DeviceInfo fields" am: b5ee680912 am: e6e72a4c40 am: d76a98d5f4
am: 6bc76c8868

Change-Id: Ie812247f6ea929d36c46c4e7ba979881b9fd1eb7