[automerger skipped] Merge "Merge "Streamline bta/dm/bta_dm_act::bta_dm_set_encryption" am: 5d83f84b am: f595403b am: fab69bbc am: 066c4832 am: 937cca33" into tm-dev am: d7e4a7e9 am: 38179152 -s ours

am skip reason: Merged-In I1d39dc04bb29c22df36902371269df8a7dc0f000 with SHA-1 6aaa5329 is already in history

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



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