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