scsi: ufs: fix ufshcd command trace command ID

For SCSI commands, their command types can be either SCSI or UFS_STORAGE.
In order to record the correct command ID for SCSI commands, both types
should be taken into consideration.

Change-Id: I887dfc4b17b35b100241a27531fbebb4608e2d5a
Signed-off-by: Can Guo <cang@codeaurora.org>