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

[automerger skipped] Merge "Fix an OOB bug in btm_ble_write_adv_enable_complete" into tm-dev am: 96c12159 am: c540558f -s ours

am skip reason: Merged-In I0f35513b9655acaa6fe07d2ba2063c1f11d6465b with SHA-1 e38dbb29 is already in history

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



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