[automerger skipped] Merge "[conflict] Merge "Fix timing attack in...

[automerger skipped] Merge "[conflict] Merge "Fix timing attack in BTM_BleVerifySignature" into tm-dev am: b9bcb27e am: b52dff3f" into udc-dev am: 2fa1b1a8 -s ours

am skip reason: Merged-In Ie41ad4ad53ede729261c6f61812d89ae2e3aaac6 with SHA-1 708c7a53 is already in history

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



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