Merge "No longer set CONFERENCE_HAS_NO_CHILDREN on SRVCC"
am: 92cad26e83

Change-Id: Idd01b1e79b523fc7bd2b975e2266244812574b87