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

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15852932

Change-Id: I2866f829029c1beb180564dc45227b92bf07b2ab