Merge "Revert "Provide correct disconnection error code"" am: df2841d7 am:...

Merge "Revert "Provide correct disconnection error code"" am: df2841d7 am: 98810d21 am: 0a8db98e

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



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