am 9647ca3d: Combining InCallUI & Dialer (part 2)

* commit '9647ca3d8e9e4799d41c436db5f594ad32397290':
  Combining InCallUI & Dialer (part 2)