am 2d675701: Merge "Combine InCallUI & Dialer (part 4)" into klp-dev

* commit '2d67570137f68247291dd6ac9fbaee8595065d41':
  Combine InCallUI & Dialer (part 4)