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

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-dev am: 1f485714 am: a5cb4b5b -s ours am: b41ae90b -s ours am: 2a7a21e5 -s ours am: 29c24085 -s ours am: 4538a2e7 -s ours am: 4a638155 -s ours am: c0b224d7 -s ours

am skip reason: Change-Id I90834b920d61bfb2df9414a25d73ba40033e4748 with SHA-1 260aa6b3 is in history

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

Change-Id: I6a03ca594e86c158268ed5a6dfd57e32e8917380