[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into...

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into pi-dev am: 06cb7834 -s ours am: 567c032f -s ours am: 8c5650f7 -s ours am: 4cb66442 -s ours am: 5cb92a39 -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 4b0fca75 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12778873

Change-Id: I3a0cb096790656d193e665ea63701f88cd001f2b