[automerger skipped] Merge "Removing non SYSTEM user before running...

[automerger skipped] Merge "Removing non SYSTEM user before running systemUserOnlyTest" into aosp-main-future am: 296549e9 -s ours am: 42c51bed -s ours

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

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



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