Resolve incomplete fix for SMP authentication bypass am: 7beac6cb am:...

Resolve incomplete fix for SMP authentication bypass am: 7beac6cb am: 66559ea4 am: 6c7348c5 am: dbc9529f am: 344f5713 am: fcff587a

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



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