[automerger skipped] Merge "Fix OOB read in add_attr" into tm-dev am:...

[automerger skipped] Merge "Fix OOB read in add_attr" into tm-dev am: 4eb06e19 am: dc01d3d7 am: 80f903f7 am: b6510737 am: 53cd887a -s ours

am skip reason: Merged-In I4b5fcbce3c0f6a767356593aade7d7d871da974c with SHA-1 a1dee2af is already in history

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



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