Merge "Add the addServiceAnnouncement API for EMBMS"