[automerger skipped] Revert "Drop connection when atttempting to disable encryption" am: 638e4875 -s ours

am skip reason: Merged-In I063e31fd74a8b319439386ecde4ce1a633b6d7bf with SHA-1 03feaca1 is already in history

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



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