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

* commit '600161044e42a2ff916da77567fd7731068c53d7':
  Make setting and unsetting InCallPresenter.mInCallActivity more robust
tree: 3ad6cb297fc812f5b1be4631642f76990ef93cb3
  1. InCallUI/