[automerger skipped] Merge "Streamline...

[automerger skipped] Merge "Streamline bta/dm/bta_dm_act::bta_dm_set_encryption" am: 5d83f84b am: f595403b am: fab69bbc am: 066c4832 am: 937cca33 am: af9f17d5 -s ours am: 4f3099a1 -s ours

am skip reason: Merged-In Ia9885b15b6a199663c86ddf0414deaa0f27dbf04 with SHA-1 69f77513 is already in history

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



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