Merge "Expose hidden API to check whether a given package is state protected" into...

diff --cc core/java/android/app/ApplicationPackageManager.java
Simple merge

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

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

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