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

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



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