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

[automerger skipped] Merge "Fix an OOB bug in btm_delete_stored_link_key_complete" into tm-dev am: e6d1eec3 am: e0c27187 am: 9a91b012 -s ours

am skip reason: Merged-In Icb13312b79a59117c9524ddad4163135b364baba with SHA-1 0ab9b925 is already in history

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



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