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

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

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



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