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

Change-Id: Ibab6739ed668f0d378aa87e2cffb5c9daa17291d