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

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

Change-Id: I4785321907582efd9294d131d0c3f06559b54575