Merge "[automerger skipped] Merge "Update SubscriptionInfo o use strings for mccmnc" am: 0babf1815c am: 08a4eb9445 am: 2656f6d049  -s ours"