am 9702f5f3: am 59c6b4d5: am fc85055f: am 196dd4d9: am 76473066: Merge "Update InCallUI for "generic" conference calls." into lmp-dev

* commit '9702f5f3c8b4eb7362469b3ff240f00039abacdf':
  Update InCallUI for "generic" conference calls.
tree: cd847b87050c4b0948c72f90c072cafd03a97c5a
  1. InCallUI/