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

Change-Id: I4c76b6143f3bbc7ea6dd1dc61d4e79631c59d20c