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

Change-Id: I951e388758296d4a7bd4da967dd4c0548415b846