Merge "Framework fixes to support VoLTE conf calls via RemoteConnectionServices." am: ed839943 am: b9f4a2d6 am: 661689ff Change-Id: I2ce1c8504b50b3466853c1102114ed1b0fe03dc1