Merge "correct the operations before and after sending cs security enable"...

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

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



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