Merge "Update InCallUI for "generic" conference calls." into lmp-dev
tree: cd847b87050c4b0948c72f90c072cafd03a97c5a
  1. InCallUI/