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

Change-Id: I5eb6be799666549b398252e87a85eb76efd745d9