Merge "Expand Gatekeeper test" am: a3645d38e9

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

Change-Id: I170873fb500893c1f4c88da948eed2bafe3e3e8d