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

Change-Id: I4e3d7114220ce44e5b14fc3d28411a1ca237cac1