Merge abc1d60a ("scsi: ufs: core: Fix ufshcd_is_ufs_dev_busy() and...

Merge abc1d60a ("scsi: ufs: core: Fix ufshcd_is_ufs_dev_busy() and ufshcd_eh_timed_out()") into android15-6.6-lts

Steps on the way to 6.6.81

Merges around all of the UFS changes as they conflict with changes in
our tree AND break the abi.  If they are needed in the future they can
come back in an abi-safe way.

Resolves merge conflicts in:

	drivers/ufs/core/ufshcd.c
	include/ufs/ufs.h
	include/ufs/ufshcd.h

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