Merge "Implement harmful app warning at activity launch"

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

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

diff --cc core/res/AndroidManifest.xml
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/core/java/com/android/server/pm/Settings.java
Simple merge