am 6b381d25: Merge "CallCardPresenter should listen for Call Waiting" into klp-dev

* commit '6b381d25a7ebd048a26a5f115e920cea27507603':
  CallCardPresenter should listen for Call Waiting
tree: 9015cf098053b511616b1e64231c42f3f8447f59
  1. InCallUI/