Merge "Show IMEI/MEID in hex, dec, and barcode when appropriate" am: 494552349a
am: 4d2b250192

Change-Id: Ibd89fbcc0dfb248dd974f76373c1243b79993987