am 58c2d7da: am 7bb908fd: Merge "Update SubscriptionInfo and mPhone for new intents." into lmp-mr1-dev

* commit '58c2d7da7219e1de1937e76dab2d83052797b2dc':
  Update SubscriptionInfo and mPhone for new intents.