Merge "Fix an authentication bypass bug in SMP" into tm-dev am: 4e5be429 am:...

Merge "Fix an authentication bypass bug in SMP" into tm-dev am: 4e5be429 am: 6b860a3c am: b6e5b624 am: 7a0c5f80 am: 69fc6a77

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



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