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

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

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



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