Merge "Document isManagedProfile usage should probably be isProfile" into tm-dev

core/java/android/os/UserManager.java

@@ -2574,6 +2574,9 @@ public class UserManager {
     /**
      * Checks if the context user is a managed profile.
      *
+     * Note that this applies specifically to <em>managed</em> profiles. For profiles in general,
+     * use {@link #isProfile()} instead.
+     *
      * @return whether the context user is a managed profile.
      */
     @UserHandleAware(
@@ -2593,6 +2596,9 @@ public class UserManager {
      * {@link android.Manifest.permission#QUERY_USERS} permission, otherwise the caller
      * must be in the same profile group of specified user.
      *
+     * Note that this applies specifically to <em>managed</em> profiles. For profiles in general,
+     * use {@link #isProfile()} instead.
+     *
      * @return whether the specified user is a managed profile.
      * @hide
      */