Merge 0625d7c2 ("Revert "Bluetooth: af_bluetooth: Fix deadlock"") into android14-6.1-lts

Steps on the way to 6.1.118

Merges around these reverts as we have already reverted them in our tree
and directly merging causes conflicts.

Change-Id: I92d2b4fe1428b1979ee3e0f63247eb3400378e3a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>