[automerger skipped] Merge "Revert "Ignore failing GattServiceTest"" into tm-qpr-dev am: be2a18b3 am: 031e6831 -s ours

am skip reason: Merged-In I6c703ba1f77901eaf48f2ac2819c0933e3cb77b5 with SHA-1 bc803020 is already in history. Merged-In was found from reverted change.

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

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



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