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

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

Change-Id: I3cd70ef75d04468dfafc78db7fd383c95b5ded43