Merge "DO NOT MERGE Add permission to launch activities on VD" into oc-mr1-dev am: bfa0ed5110
am: 605c86a48a  -s ours

Change-Id: I753b08b392b8d8e4bccfe48543b372a40f359e6d