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

Change-Id: I06cd03592c0ce23c42e8420ac0eef1bd61f233ff