Merge "Keep Multiuser toggle hint visible at all times" into main

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

@@ -47,6 +47,10 @@ public class MultiUserTopIntroPreferenceController extends BasePreferenceControl
     @Override
     public void updateState(Preference preference) {
         mUserCaps.updateAddUserCapabilities(mContext);
-        preference.setVisible(isAvailable());
+        if (android.multiuser.Flags.newMultiuserSettingsUx()) {
+            preference.setVisible(!mUserCaps.mIsGuest);
+        } else {
+            preference.setVisible(isAvailable());
+        }
     }
 }