Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." into nyc-mr1-dev
am: 049980c284

Change-Id: I003ba96a8358b3104acae03f8e2a3e53d8b976df