Merge "Update SIM info table to have strings for mcc mnc"