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

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



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