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

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

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



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