[automerger skipped] Fix memory overflow. am: 8d9eb989 am: f36a6991 am:...

[automerger skipped] Fix memory overflow. am: 8d9eb989 am: f36a6991 am: 2b71057f am: 69ec817b am: 6d097ffc am: bcff0df2 -s ours

am skip reason: skipped by user jpawlowski

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

Change-Id: Ib25d1a85f5090eb5a1424447f1423a6f7586ad63