[automerger skipped] Merge "SMP: Set pairing parameters for CTKD by...

[automerger skipped] Merge "SMP: Set pairing parameters for CTKD by properties" into tm-qpr-dev am: 7dce1d06 am: db27dd22 -s ours

am skip reason: Merged-In Iaf250e12cc58abb8df8ebad32c6593ebcd974ee8 with SHA-1 eee7ec6f is already in history

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



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