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

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

am skip reason: Merged-In I7f5646b683209bc6a6fbce8d4702ec311adc9cfc with SHA-1 dfb61b55 is already in history

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



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