Merge "Revert "Update SubscriptionInfo o use strings for mccmnc""