[automerger skipped] Merge "Add blindScan condition to blindScan test" am:...

[automerger skipped] Merge "Add blindScan condition to blindScan test" am: 32b4c502 am: 5376672d am: 65d9678e am: 3155a60c -s ours

am skip reason: Merged-In If44df620ab90b5b0247fbee15e2b2a57e27683b5 with SHA-1 d4c22d8e is already in history

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

Change-Id: I28bea3ba3af290ce3121365c228c4b44120334d5