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

[automerger skipped] Merge "Fix potential OOB write in libbluetooth" into oc-mr1-dev am: 9ed9fb4d -s ours am: c1949dc9 -s ours am: c36f2a56 -s ours am: 0e14567e -s ours

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

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

Change-Id: I73acbccc3118e746bc504e51c7a7fe77a9b9577e