[automerger skipped] Merge "Revert "Expand Gatekeeper test"" into stage-aosp-sc-ts-dev am: 6377593930 am: d6aff4eb6c -s ours am: 6e9b923eee -s ours am: eecce6a2ba -s ours

am skip reason: Merged-In I7dbcebe0be03280bc72a34542da0c479ea600ee4 with SHA-1 bcebe4ead0 is already in history

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

Change-Id: I8b1e5989e61da065b122230a3cc4683b835845e2