Merge cherrypicks of [2342197] into ub-testdpc-oc-release

Change-Id: Ifbec1e7f1a626fd861ab77f6cebc03d9c35b7105

Author: android-build-team Robot

app/src/main/java/com/afwsamples/testdpc/common/Util.java

@@ -129,8 +129,11 @@ public static boolean isManagedProfileOwner(Context context) {
                 return false;
             }
         }
-        UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        return isProfileOwner(context) && userManager.getUserProfiles().size() > 1;
+
+        // Pre-N, TestDPC only supports being the profile owner for a managed profile. Other apps
+        // may support being a profile owner in other contexts (e.g. a secondary user) which will
+        // require further checks.
+        return isProfileOwner(context);
     }
 
     @TargetApi(VERSION_CODES.M)
@@ -207,4 +210,4 @@ public static boolean installCaCertificate(InputStream certificateInputStream,
     private static DevicePolicyManager getDevicePolicyManager(Context context) {
         return (DevicePolicyManager)context.getSystemService(Service.DEVICE_POLICY_SERVICE);
     }
-}
+}