Merge "Check permission for activity embedding" into oc-mr1-dev
am: 87ad0f7f40

Change-Id: I61855e252badff840acc78e3894695951e09d3fe