am 30fd6cd5: Merge "Make setting and unsetting InCallPresenter.mInCallActivity more robust" into lmp-mr1-dev

* commit '30fd6cd5b348e087568a0acd67fa0cf5549f8103':
  Make setting and unsetting InCallPresenter.mInCallActivity more robust
tree: 6d06bb923c2077b528f4b55e0e34e411bc25985d
  1. InCallUI/