Merge "Move service discovery test cases into a separate folder" into main am:...

Merge "Move service discovery test cases into a separate folder" into main am: e2cf3a88 am: f4310687

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



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