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

Change-Id: I1c214675a306f415f600757b6e9a3fc0b4f2d9ce