[automerger skipped] Merge "Add additional GattServiceTest #2" into tm-qpr-dev am: 2ba1a33c am: 21031822 -s ours

am skip reason: Merged-In I41631380f4de987b57154194741151e0cfe1ddad with SHA-1 a33459ac is already in history

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



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