[automerger skipped] Merge "Revert "Expand Gatekeeper test"" into...

[automerger skipped] Merge "Revert "Expand Gatekeeper test"" into stage-aosp-sc-ts-dev am: 63775939 am: d6aff4eb am: a21b943f -s ours

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

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

Change-Id: I82f0c27dbe0beae5c9e234b52054e199b2cedfd0