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

Change-Id: I756e5b2ec75667aedf4fb021b706ac1b1dcc6d36