Merge "Revert "SMP: Avoid repeated csrk generation"" am: e1148580 am:...

Merge "Revert "SMP: Avoid repeated csrk generation"" am: e1148580 am: 60351072 am: 65eba95a am: 8495904c

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

Change-Id: Ic6b994abfa2a0c7fb99f6e04162a31252841e2de