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

* commit 'fc85055f4047b9af1315dc46d322c96a9e24c22c':
  Update InCallUI for "generic" conference calls.
tree: b34cbeed490fe806d673e2705336dbd260f38cdc
  1. InCallUI/