[automerger skipped] Merge "Merge "Streamline...

[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 -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: I28656073a478dbd802fc8118cce594091b04dc28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>