Merge "Expand Gatekeeper test" am: a3645d38e9 am: 3a17b7adf6 am: 2b180742ae am: 2049dbaf56

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

Change-Id: Id09f560e2726fabe3bbdeca9896b2c03eb44d42e