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: 1518d64c

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



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