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

* commit '2b1716c94128f8e2cde81efe5990c5b70c9ae423':
  Update SubscriptionInfo and mPhone for new intents.