Merge "Expand Gatekeeper test" am: a3645d38e9 am: 3a17b7adf6

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

Change-Id: I82cbb49766e02b006d47e4b49081a8f946392f7a