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

Change-Id: Ifd7fa2a83fa262a9c7ae72f80274033f604ebb25