[automerger skipped] Merge "Removing non SYSTEM user before running systemUserOnlyTest" into main am: 47bc312bfa -s ours am: e4a9aa0796 -s ours

am skip reason: Merged-In I6f536b7f5b85e4e884bd284b1848e43ac3c9029d with SHA-1 82efbd0ef0 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802924

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