[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 -s ours am: 56d5151a -s ours am: f0c24061 -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: I707eb887f7a70f4a14149b466838045a36763de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>