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

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

Change-Id: If5314b87f78902fdc032dedbe45acfff4aaa7d99