Merge changes Iac15302a,I228ce134

* changes:
  Rollback the broadcast in-call UI changes since it breaks AOSP.
  Rollback the rollback of broadcast in-call UI changes.