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: cdd9be5d

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



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