am 0b9ca916: am aa48f9e0: Merge "Turn screen on for call-waiting calls" into klp-dev

* commit '0b9ca916386da6d976f5a0182d016cf8431c3349':
  Turn screen on for call-waiting calls
tree: ac92e0260c7e856fcab865c68dd742cc06c19785
  1. InCallUI/