[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: 0f846dad -s ours am: f7a28eed -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: I05236f07c4645ba1cdad458bc5066bbed0834b86