am 4afe15e0: Merge "Support Conferences in Remote Connections" into lmp-dev

* commit '4afe15e0bd1c395374397f84e24e95c77f8c339c':
  Support Conferences in Remote Connections