Merge "scsi: ufs: don't try adding boot and rpmb lun if not supported" into msm-4.8