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

Change-Id: Id43c6c5c39767964e55b40d62785e3d14d4a4828