Merge "Streamline bta/dm/bta_dm_act::bta_dm_set_encryption" am: 5d83f84b am: f595403b

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



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