Merge "Remove SDP record for GTBS and GMCS" am: b13f5b78 am: d0ed21f8 am:...

Merge "Remove SDP record for GTBS and GMCS" am: b13f5b78 am: d0ed21f8 am: 47068df3 am: 53118cba am: fda1017a

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



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