Merge "Revert "scsi: Set request queue runtime PM status back to active on resume"" into msm-4.9