Merge "Fix an OOB bug in set_data" into tm-dev am: 125cf1ea am: de28d04d

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



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