[automerger skipped] Merge "Ensure conference state is posted to Telecom for new conferences." am: 2e46eac097 am: d53dc11b1f -s ours am: c1e2aaed63 -s ours
am skip reason: Change-Id I203880c593f6bac471a06eb9dcbb529d0bb75ba5 with SHA-1 de47fdda7d is in history
Change-Id: I8a802babb8b32699302aaf67de6e95b396d20295
This commit is contained in: