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

Merge "Merge "Streamline stack/btm/btm_sec::BTM_SetEncryption" am: 63a911a9 am: a0f8ace5 am: 096cef44 am: 87e8b189" into tm-dev am: 8533cc0e

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



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