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: Ic4d52b38869a75a163b5ec3c82d46c668b0776eb