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

Change-Id: If3bd6c4a504ef464b6936fee9e96373551bed670