Merge "Add @TestApi for EMBMS APIs needed for CTS"
am: f1167ced38

Change-Id: If22e7de55c8ec2f603c4a59f575b65cebf421a93