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

Change-Id: I72fac0c55e0175256e35a9c12fea6d39c98bf468