[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 -s ours am: 383b55ce -s ours am: 29baff5a -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: I620d435043dbd7f71f9c464b86265082148b3b2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>