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

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

Change-Id: Id8b7318a448388efccceb4e8188cd492b00ee616