Merge "Revert "Expand Gatekeeper test"" am: 621519943b

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

Change-Id: I3eb3da36560f0b6aeb08331dec01c44c6d87466d