Merge "Streamline stack/btm/btm_sec::BTM_SetEncryption" am: 63a911a9 am: a0f8ace5

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



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