[automerger skipped] Merge "Update SubscriptionInfo o use strings for mccmnc" am: 0babf1815c am: 08a4eb9445
am: 2656f6d049  -s ours

Change-Id: I8be5c1a12aec361c9a119092332c4ee23ee4e9e2