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

Change-Id: I81dae708fe3eb0b7c2bd3184a89fabde98bf4a74