Merge "SMP: Use single quirk flag to control CSRK distribution" am: e6d1d7b9

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



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