[automerger skipped] Merge "[GATT] Ensure synchronized when adding a value"...

[automerger skipped] Merge "[GATT] Ensure synchronized when adding a value" into tm-qpr-dev am: ac4d6b31 -s ours am: 49791def -s ours

am skip reason: Merged-In I1ab7ea1d5ea78952ea6761e7dc6c3c455059b269 with SHA-1 0e85068c is already in history

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



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