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

Change-Id: I5758e7a22c772d3c7b0800c8d93b0206cbfb6b70