Merge "Update SIM info table to have strings for mcc mnc" am: 2e3f1900df
am: bf210691fb

Change-Id: I0ae01edea8019e11e30c82740d5d0d8ac216d2cb