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

Resolve incomplete fix for SMP authentication bypass am: 7beac6cb am: 66559ea4 am: 6c7348c5 am: e7fc4168

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



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