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

Change-Id: I2470d095213d72e8a6c96c657778b8d9db66001d