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

Merge "Streamline bta/dm/bta_dm_act::bta_dm_set_encryption" am: 5d83f84b am: f595403b am: fab69bbc am: 066c4832 am: 937cca33

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



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