Merge "Update SIM info table to have strings for mcc mnc"
am: 2e3f1900df

Change-Id: I66472f3931ea88d553f140d33aeb3dc0af8e6eff