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

Change-Id: I6a92baaf5403689306cf2d81d9c633e7584c233f