Merge "Expose forceUpdateUserSetupComplete as a TestAPI"

core/api/test-current.txt

@@ -368,6 +368,7 @@ package android.app {
 package android.app.admin {
 
   public class DevicePolicyManager {
+    method public void forceUpdateUserSetupComplete();
     method public long getLastBugReportRequestTime();
     method public long getLastNetworkLogRetrievalTime();
     method public long getLastSecurityLogRetrievalTime();

core/java/android/app/admin/DevicePolicyManager.java

@@ -11241,6 +11241,7 @@ public class DevicePolicyManager {
      *         {@code android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS} or the caller is
      *         not {@link UserHandle#SYSTEM_USER}
      */
+    @TestApi
     public void forceUpdateUserSetupComplete() {
         try {
             mService.forceUpdateUserSetupComplete();