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

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

Change-Id: I56e34d9665b2d0cfa85b4aaa995243f08fe9abfb