am 21b732ff: am 2159a502: Merge "Re-add some CallNotifier implementations." into lmp-dev

* commit '21b732ff0687f0bdaa2a9707b93333f7da77bb47':
  Re-add some CallNotifier implementations.