[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: 7a0c5f80 am: 69fc6a77 am: af17ec6b -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: I5bf86e9e8820536a58672a32edc30bf8ef96e343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>