Merge "Provide correct disconnection error code" am: 5346a3bc am: 88a96bc7 am: c6a9d5d8

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



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