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

Change-Id: Ic150e9566f960c66ad6cec9997251362a2913541