[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 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: I43d2bde46740879d4114e2b9a07c9850b1825b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>