Android N MR2 Preview 2
Merge "Make MtpService fill in MTP DeviceInfo fields"