Merge "[conflict] Merge "Fix timing attack in BTM_BleVerifySignature" into...

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

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



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