Merge "Allow PO to check if it is in a managed profile." into nyc-dev

diff --cc api/current.txt
index 94e07fc,c97573d..3ac9685
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
@@@ -5900,8 -5900,8 +5900,9 @@@ package android.app.admin 
      method public boolean isCallerApplicationRestrictionsManagingPackage();
      method public boolean isDeviceOwnerApp(java.lang.String);
      method public boolean isLockTaskPermitted(java.lang.String);
+     method public boolean isManagedProfile(android.content.ComponentName);
      method public boolean isMasterVolumeMuted(android.content.ComponentName);
 +    method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
      method public boolean isProfileOwnerApp(java.lang.String);
      method public boolean isProvisioningAllowed(java.lang.String);
      method public boolean isSecurityLoggingEnabled(android.content.ComponentName);

diff --cc api/system-current.txt
index b80c413,dec80c8..5647629
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -6047,8 -6046,8 +6047,9 @@@ package android.app.admin 
      method public boolean isCallerApplicationRestrictionsManagingPackage();
      method public boolean isDeviceOwnerApp(java.lang.String);
      method public boolean isLockTaskPermitted(java.lang.String);
+     method public boolean isManagedProfile(android.content.ComponentName);
      method public boolean isMasterVolumeMuted(android.content.ComponentName);
 +    method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
      method public boolean isProfileOwnerApp(java.lang.String);
      method public boolean isProvisioningAllowed(java.lang.String);
      method public boolean isSecurityLoggingEnabled(android.content.ComponentName);

diff --cc api/test-current.txt
index 53da459,8fa75e0..9a38eec
--- 1/api/test-current.txt
--- 2/api/test-current.txt
+++ b/api/test-current.txt
@@@ -5904,8 -5904,8 +5904,9 @@@ package android.app.admin 
      method public boolean isCallerApplicationRestrictionsManagingPackage();
      method public boolean isDeviceOwnerApp(java.lang.String);
      method public boolean isLockTaskPermitted(java.lang.String);
+     method public boolean isManagedProfile(android.content.ComponentName);
      method public boolean isMasterVolumeMuted(android.content.ComponentName);
 +    method public boolean isPackageSuspended(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
      method public boolean isProfileOwnerApp(java.lang.String);
      method public boolean isProvisioningAllowed(java.lang.String);
      method public boolean isSecurityLoggingEnabled(android.content.ComponentName);

diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge