[automerger skipped] Merge "Update SIM info table to have strings for mcc mnc" am: 2e3f1900df am: bf210691fb
am: c4ef8f9319  -s ours

Change-Id: Ie3434b66f426e3006b493e8b30c65a27927f9e86