Merge "Skip multi user tests on devices that don't support it" into stage-aosp-tm-ts-dev