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

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