[automerger skipped] Resolve incomplete fix for SMP authentication bypass am:...

[automerger skipped] Resolve incomplete fix for SMP authentication bypass am: 7beac6cb am: 13d12470 am: b0663042 -s ours

am skip reason: skipped by delwiche

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



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