Merge "Add the addServiceAnnouncement API for EMBMS" am: 1ba0bc20b9 am: 7ffc3b9f58

Change-Id: I1d3b203a8782500ed26cc3df8b6dbabb1b4a5d02