Merge "Removing non SYSTEM user before running systemUserOnlyTest" into aosp-main-future