Merge "BluetoothGatt: Fix duplicate GATT services being added" into main am:...

Merge "BluetoothGatt: Fix duplicate GATT services being added" into main am: 5cb7fde7 am: a9f38dfe

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



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