Merge "Revert "Drop connection when atttempting to disable encryption"" into tm-qpr-dev am: ee7c9192 am: cf1df252

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



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