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

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

Change-Id: I55f4521857f1704a5d89130d482c79ff347db87c