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

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



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