Merge "PandoraServer: Fix sdp test for movable service" am: f3a6b309 am:...

Merge "PandoraServer: Fix sdp test for movable service" am: f3a6b309 am: 64226083 am: 5d6778f0

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



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