Merge "sys user split: fix user settings user list"

src/com/android/settings/users/UserSettings.java

@@ -706,8 +706,9 @@ public class UserSettings extends SettingsPreferenceFragment
         userPreferences.add(mMePreference);
 
         for (UserInfo user : users) {
-            if (user.isManagedProfile()) {
+            if (!user.supportsSwitchToByUser()) {
-                // Managed profiles appear under Accounts Settings instead
+                // Only users that can be switched to should show up here.
+                // e.g. Managed profiles appear under Accounts Settings instead
                 continue;
             }
             UserPreference pref;