[automerger skipped] [conflict] Merge "Fix an authentication bypass bug in...

[automerger skipped] [conflict] Merge "Fix an authentication bypass bug in SMP" into tm-dev am: 4e5be429 am: d9fdb879 am: bb3648f0 am: f14baa99 -s ours

am skip reason: Merged-In Id36c06beb13bcbc9b499ef59f6d4e43ac616da10 with SHA-1 eaa36737 is already in history

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



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