Merge "Revert "Expand Gatekeeper test"" into stage-aosp-sc-ts-dev