[automerger skipped] Merge "Fix an OOB bug in btm_read_local_oob_complete"...

[automerger skipped] Merge "Fix an OOB bug in btm_read_local_oob_complete" into tm-dev am: 993b0731 am: b5e33839 am: 60ea271f -s ours

am skip reason: Merged-In I739a42519df656b28d6043f179d02316bf5a71f2 with SHA-1 14eaa92e is already in history

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



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