Remove conflict markers from GattService.java

Test: mmm packages/modules/Bluetooth
Flag: EXEMPT IOP fix
Ignore-AOSP-First: Conflict resolution broke 24Q3-release branch
Bug: 369329192
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:579cdd75a27bff626cf98e230eb6db120261ac2d)
Merged-In: Ide2796e486c7c685afed70ef975c54f684ceb017
Change-Id: Ide2796e486c7c685afed70ef975c54f684ceb017