[automerger skipped] Merge "Fix issue where >2 party conference connect time...
[automerger skipped] Merge "Fix issue where >2 party conference connect time is wrong on child drop." am: 62f0538c am: 4d295785 -s ours
am skip reason: Change-Id I94bca6dd6f8379099373bf9ea472a8da1837d9df with SHA-1 02037d43 is in history
Change-Id: Id7435dff486ca6a2f519bbf78a08ccb6935647d8