[automerger skipped] 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 am: b7d2278b -s ours

am skip reason: skipped by user siyuanh

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



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