Merge "Merge "Streamline bta/dm/bta_dm_act::bta_dm_set_encryption" am:...

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: e67d585b

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



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