Merge "Revert "Fix crash by passing original slot id to avoid race...

Merge "Revert "Fix crash by passing original slot id to avoid race condition."" into main am: 5fc7ec06

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



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