Merge "Fix authentication bypass bug in SMP" into tm-dev am: 83b29a10 am:...

Merge "Fix authentication bypass bug in SMP" into tm-dev am: 83b29a10 am: f377ad68 am: eaebf5df am: 4793f8bb am: e7170528 am: 68923059

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



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