ANDROID: scsi: sd: Fix unexpect removal code on Merge commit

The merge change is incorrect and cause issue at device resume:

[   78.858757][ T2143] sd 0:0:0:0: [sda] Starting disk
[   78.858852][ T2143] sd 0:0:0:0: [sda] Start/Stop Unit failed: Result: hostbyte=DID_OK driverbyte=DRIVER_OK
[   78.858868][ T2143] sd 0:0:0:0: [sda] Sense Key : Unit Attention [current]
[   78.858881][ T2143] sd 0:0:0:0: [sda] Add. Sense: Power on, reset, or bus device reset occurred
[   78.858898][ T2143] sd 0:0:0:0: PM: dpm_run_callback(): scsi_bus_resume+0x0/0x84 returns -5

Bug: 369929235
Fixes: 2b530e8f ("Merge 6.1.84 into android14-6.1-lts")
Change-Id: Id96ca2a3c8183f8f9b86cfd9ce173c4acdaaab2c
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>