[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: 45c8c3de am: 4d6e2a9a am: 6511a001 am: 5585afdb am: 00d8b414 -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: Ia5edc6caa27d253a35b10a5fb2ff572c26e0da4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>