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: 52050fa1 am: 45a54d86 am: 2faba099

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



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