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

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

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



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