ANDROID: scsi: ufs: fix more bad merge resolutions with custom sg entry size

Fix bad merge resolutions between Android-specific commit 8de80df7
("ANDROID: scsi: ufs: allow ufs variants to override sg entry size")
and the following upstream commits:

- commit 26f968d7 ("scsi: ufs: Introduce UFSHCD_QUIRK_PRDT_BYTE_GRAN quirk")
- commit cc770ce3 ("scsi: ufs: Make ufshcd_print_trs() consider UFSHCD_QUIRK_PRDT_BYTE_GRAN")

This should be folded into
ANDROID-scsi-ufs-allow-ufs-variants-to-override-sg-entry-size.patch.

Fixes: 2c136de3 ("Merge 86cfccb6 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline")
Fixes: 22a7eefb ("Merge 55e0500e ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi"

) into android-mainline")
Bug: 162257402
Change-Id: I3a2f1f5b6df43028dde248b9a932f5595dd13e21
Signed-off-by: Eric Biggers <ebiggers@google.com>