Merge "Hide the SEND_EMBMS_INTENTS permission" into oc-mr1-dev
am: d259d8b80f

Change-Id: I5abcbb619d38beb28be00f34a1ee3cffe351c721