am a8b5c8f9: Merge "Remove generic call merge button." into lmp-dev

* commit 'a8b5c8f943c55619141cca0f82968ae575df5992':
  Remove generic call merge button.
tree: c65c2ff4b1fa01b3b8060a972f321cfd1e186bc4
  1. InCallUI/