Merge "Add explicit and persistent user provisioning state."

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

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

diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge

diff --cc services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
index 622106f,72421ae..87569b7
--- 1/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
--- 2/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
@@@ -71,8 -71,11 +72,12 @@@ import static org.mockito.Mockito.when
  
   (mmma frameworks/base/services/tests/servicestests/ for non-ninja build)
   */
 +@SmallTest
  public class DevicePolicyManagerTest extends DpmTestBase {
+     private static final List<String> OWNER_SETUP_PERMISSIONS = Arrays.asList(
+             permission.MANAGE_DEVICE_ADMINS, permission.MANAGE_PROFILE_AND_DEVICE_OWNERS,
+             permission.MANAGE_USERS, permission.INTERACT_ACROSS_USERS_FULL);
+ 
      private DpmMockContext mContext;
      public DevicePolicyManager dpm;
      public DevicePolicyManagerServiceTestable dpms;