Merge "Fix OOB read in add_attr" into tm-dev am: 4eb06e19 am: dc01d3d7 am: 80f903f7

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



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