Merge "Hide accounts of users that should not be shown" into main am: 8595d95122 am: e686f52dae

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2898064

Change-Id: Id8633255778586d21ecc6f3fa0a52c7f4f036262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/accounts/AccountPreferenceController.java

@@ -353,6 +353,10 @@ public class AccountPreferenceController extends AbstractPreferenceController
             }
             return;
         }
+        if (mUm.getUserProperties(userInfo.getUserHandle()).getShowInSettings()
+                == UserProperties.SHOW_IN_SETTINGS_NO) {
+            return;
+        }
         final Context context = mContext;
         final ProfileData profileData = new ProfileData();
         profileData.userInfo = userInfo;