[automerger skipped] Merge "Remove SDP record for GTBS and GMCS" into tm-dev...

[automerger skipped] Merge "Remove SDP record for GTBS and GMCS" into tm-dev am: 9f306561 am: 6aa1eef1 am: 641eb664 -s ours

am skip reason: Merged-In I919aa8e2a53f5b6f474ead764be9e24e02fcd9ea with SHA-1 d561909c is already in history

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



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