Merge "Adding the (lost) buttons back upon disconnected calls, see b/11028671." into klp-dev
tree: 1d0974c122f612624d1269a903d417b402a306fb
  1. InCallUI/