Merge "Activity interceptor dialog for suspended apps" into pi-dev

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

diff --cc core/java/android/content/pm/PackageManagerInternal.java
Simple merge

diff --cc core/res/res/values/symbols.xml
Simple merge

diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge

diff --cc services/tests/servicestests/src/com/android/server/am/ActivityStartInterceptorTest.java
Simple merge