[conflict] Merge "Fix an authentication bypass bug in SMP" into tm-dev am:...

[conflict] Merge "Fix an authentication bypass bug in SMP" into tm-dev am: 4e5be429 am: d9fdb879 am: bb3648f0

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



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