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

diff --cc api/system-current.txt
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityRecord.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityStarter.java
Simple merge

diff --cc services/core/java/com/android/server/am/TaskRecord.java
Simple merge