am 5083fe9b: am 28c55a37: Merge "Adding the (lost) buttons back upon disconnected calls, see b/11028671." into klp-dev

* commit '5083fe9bc668f641e316315a99a12d0b7c1bda37':
  Adding the (lost) buttons back upon disconnected calls, see b/11028671.
tree: 305ce1ecc90f2c566e09db7eed7ece15a51323a9
  1. InCallUI/