Merge "Revert "Expand Gatekeeper test"" am: 621519943b am: 417c595019 am: 63d7695f35 am: 90000cbe94 am: d309165656

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

Change-Id: Icfbe813027a60ade046e9f19f08071ac6a0e66cd