[automerger skipped] Merge "Revert "Update SubscriptionInfo o use strings for mccmnc""
am: f92ad05fa5  -s ours

Change-Id: If211a292335419751be21e670b1ddb489d3c54b4