[automerger skipped] Merge "Fix authentication bypass bug in SMP" into tm-dev...

[automerger skipped] Merge "Fix authentication bypass bug in SMP" into tm-dev am: 83b29a10 am: f377ad68 am: eaebf5df am: 4793f8bb am: e7170528 am: 68923059 am: a46dcfed -s ours

am skip reason: Merged-In I284b9581648b1f6e15eee371a39517c634d289fd with SHA-1 d9de53d4 is already in history

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



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