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

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



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