Merge "Streamline bta/dm/bta_dm_act::bta_dm_encrypt_cback" am: 29bf2a02 am: 18fb370a

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



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