[automerger skipped] Merge "Fix an authentication bypass bug in SMP" into...

[automerger skipped] Merge "Fix an authentication bypass bug in SMP" into tm-dev am: 4e5be429 am: 6b860a3c am: b6e5b624 am: 6cc6c9a0 am: fefcbb3d am: 87e4c278 -s ours

am skip reason: Merged-In Id36c06beb13bcbc9b499ef59f6d4e43ac616da10 with SHA-1 eaa36737 is already in history

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



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