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

Change-Id: I6cb9a490d20e71432ea7f6afd87ae58a5570d34e