Merge "Fix OOB read in add_attr" into tm-dev am: 4eb06e19 am: 45c8c3de am: 4d6e2a9a

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



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