Merge "Add blindScan condition to blindScan test" am: 32b4c5025b am: 5376672d34

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

Change-Id: I2c5325c4074a3494d76de47c78772a8e5d89cb77