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

Resolve incomplete fix for SMP authentication bypass am: 7beac6cb am: 13d12470 am: b0663042 am: 1cd9393f

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



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