Merge "Fix an OOB bug in set_data" into tm-dev am: 8473c8c6 am: 9435f9b0 am: 13bfe953

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



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