Merge "Simplify and rewire in-call buttons" into m-wireless-dev
tree: beb5c8242dcb6aa31a6dd9f5a0990740cf83d036
  1. InCallUI/