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

Merge "Streamline stack/btm/btm_sec::btm_sec_encrypt_change am: 66708b1b am: d33563ab am: 83cd7b3f am: debcc0d6 am: b7e99a51" into tm-dev am: fae2c609 am: c35aba17

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



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