Merge "Fix issue where >2 party conference connect time is wrong on child...
Merge "Fix issue where >2 party conference connect time is wrong on child drop." into rvc-dev am: f44235f0 am: 8427c6a7 am: ce0d10c1
Change-Id: Icb2030f9f20b76d59b8144a49bc5aac525730962