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

Change-Id: Ic26652eba541fc36d57a44c9be4dc5ab667c100f