DO NOT MERGE EDI: Add DeviceInfo wrapper class for DeviceInfoActivity

Bug:26723567
Change-Id: I149241afb93e78960c5c343eb48a2c04faacd138
4 files changed