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: 181b6356 am: b59e4913

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



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