[automerger skipped] Streamline bta/dm/bta_dm_act::bta_dm_encrypt_cback am:...

[automerger skipped] Streamline bta/dm/bta_dm_act::bta_dm_encrypt_cback am: 1a70edea -s ours am: d89cb6e9 -s ours am: 6924449a -s ours am: 98bdf5a6 -s ours

am skip reason: Merged-In Ica0cbc68dff65afc9a064f8d8d749fda0edb5973 with SHA-1 3acc539f is already in history

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



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