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

Change-Id: I1833cb2d5437cccb61cc8f6dcd884a45a2b3250f