Streamline stack/btm/btm_sec::btm_sec_encrypt_change am: 66708b1b am:...

Streamline stack/btm/btm_sec::btm_sec_encrypt_change am: 66708b1b am: d33563ab am: 83cd7b3f am: debcc0d6 am: b7e99a51

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



Bug: 229694406
Tag: #refactor
Test: gd/cert/run
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I65e47d07b56e97c9decb032a4c77997888e52833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from commit c0d7cce6)