Merge "Test parallel service discovery with pairing cancelation" into main am:...

Merge "Test parallel service discovery with pairing cancelation" into main am: 07bb567d am: f063ec8a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2854045



Change-Id: I87de03cc3e1899703933c2abc0f2e040c18e5820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>