Merge "Ensure tests work with restricted bucket toggling." into stage-aosp-rvc-ts-dev