[automerger skipped] Merge "Fix OOB of L2CAP_CMD_CREDIT_BASED_CONN_RES" am:...

[automerger skipped] Merge "Fix OOB of L2CAP_CMD_CREDIT_BASED_CONN_RES" am: 127a13d7 am: 9587e6e0 am: 9143a1a9 am: f8d81f34 am: 61ba84b7 -s ours

am skip reason: Merged-In Ieb6ebc88a40d044a0bbb3311fe2f5b7d5b571b9e with SHA-1 c9bf9d2d is already in history

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



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