Merge "correct the operations before and after sending cs security enable" into main am: 23b83cc0

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



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