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

* commit 'aa48f9e04c983eef57b90bd4c76af59cca37b569':
  Turn screen on for call-waiting calls
tree: b95b65444879dc009914d8e0e54595503db4e8fa
  1. InCallUI/