Merge "Removing non SYSTEM user before running systemUserOnlyTest" into udc-dev-plus-aosp