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

Change-Id: I83b174e262a39aa354f0d610192d9c7486e4fc60