Merge "Update SubscriptionInfo o use strings for mccmnc" am: 0babf1815c
am: 08a4eb9445

Change-Id: I0462d1de1c2622499470b00195897ce370a13020