[automerger skipped] Merge "Revert "Revert "Update SIM info table to have strings for mcc mnc""" am: 90feda37fe  -s ours am: 082ae2503e  -s ours
am: 782466fc95  -s ours

Change-Id: I80501c5e579fd41217deee41b2f5e4bb76fe4b0a