[automerger skipped] [resolved conflict] Fix multiple OOB bugs resulted from...

[automerger skipped] [resolved conflict] Fix multiple OOB bugs resulted from tx mtu in EATT am: ea76b7d9 am: 3b942b84 -s ours am: 7256f462 -s ours am: 7b0ac52e -s ours

am skip reason: Merged-In Ia06c9a17f2daa5ce4c32cffa536777f47774cf31 with SHA-1 282d4a18 is already in history

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



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