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

[automerger skipped] Merge "Removing non SYSTEM user before running systemUserOnlyTest" into udc-dev-plus-aosp am: aeadff89 am: 25797f83 -s ours

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

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



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