[automerger skipped] Merge "Ignore failing GattServiceTest" into tm-qpr-dev...

[automerger skipped] Merge "Ignore failing GattServiceTest" into tm-qpr-dev am: e038cd6a -s ours am: d5ba33ba -s ours

am skip reason: Merged-In I6c703ba1f77901eaf48f2ac2819c0933e3cb77b5 with SHA-1 bc803020 is already in history

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



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